merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 4 Feb 2007 19:24:53 +0000 (12:24 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Sun, 4 Feb 2007 19:24:53 +0000 (12:24 -0700)
commita6e547a2371e9ceeb2aeb6cf9733f73edb411684
treed2d7cd9d69b8ff5fbbf7f3489ddb82755882c68e
parentc4c9842abd9d1a40956ee11433244ff4f73055c1
parentec48ab815b556a8f0a2ba9c5287b13fd4cf39607
merge with xen-unstable.hg